home *** CD-ROM | disk | FTP | other *** search
/ Resource Library: Multimedia / Resource Library: Multimedia.iso / utils / sound / players / unix / xtank / xtank1.3d_ next >
Encoding:
Text File  |  1993-01-31  |  24.0 KB  |  874 lines
  1. #
  2. # This sound patch to xtank1.3d will only work on Suns workstations
  3. # with sound support.
  4. #
  5. # This patch will only work on an original xtank1.3d (as far as I know)
  6. # For sounds to work you must also have the rplay package installed
  7. # on all machines using xtank, this means the server and clients.
  8. # If rplay is not installed on a client machine that client will not
  9. # receive any of the sounds.
  10. # The rplay package along with the sound files are available via anonymous
  11. # ftp at sciences.sdsu.edu.  The Imakefile in the Src directory also
  12. # is setup to link with the librplay.a in /usr/local/lib.  If you changed
  13. # the directory where librplay.a lives you will have to edit the Imakefile
  14. # in Src.
  15. #
  16. # To apply the sound patch...
  17. # % cd your_xtank_directory (the one with Imakefile.Config)
  18. # % patch -p0 < sound-patches >& patchresults
  19. #
  20. # There is a new directory called Sound which contains a file
  21. # called list.  This file contains a list of all the sound file names
  22. # that are to be used for the appropriate xtank sounds.
  23. #
  24. # Send problems/questions/comments to boyns@sciences.sdsu.edu.
  25. #
  26. # Mark
  27. #
  28. *** Src/setup.c    Thu Jun 25 17:07:30 1992
  29. --- xtank1.3d-sound/Src/setup.c    Thu Jun 25 08:40:57 1992
  30. ***************
  31. *** 55,60 ****
  32. --- 55,63 ----
  33.   #include "thread.h"
  34.   #include "globals.h"
  35.   #include "assert.h"
  36. + #ifdef SOUND
  37. + #include "sound.h"
  38. + #endif SOUND
  39.   
  40.   extern Map real_map;
  41.   extern Boolean game_paused;
  42. ***************
  43. *** 279,287 ****
  44. --- 282,298 ----
  45.   
  46.       game_running = True;
  47.   
  48. + #ifdef SOUND
  49. +     play_all(ATTENTION_SOUND);
  50. + #endif SOUND
  51. + 
  52.       do {
  53.           status = animate();
  54.       } while (status == GAME_RUNNING);
  55. + 
  56. + #ifdef SOUND
  57. +     play_all(GOODBYE_SOUND);
  58. + #endif SOUND
  59.   
  60.       game_running = False;
  61.   
  62. *** /dev/null    Wed Jun 24 08:56:45 1992
  63. --- Sounds/list    Tue Jun 23 13:46:07 1992
  64. ***************
  65. *** 0 ****
  66. --- 1,47 ----
  67. + #
  68. + # This file contains the names of the sound files used for sounds.
  69. + # The numbers in the first column represent the number associated
  70. + # with the #defines in Src/Include/Sound.h.
  71. + # When adding new sounds changes must be made both to the Sound.h
  72. + # and this list.  To change a sound just change the name here.
  73. + #
  74. + 0    click1.au        # lmg
  75. + 1    click1.au        # mg 
  76. + 2    click1.au        # hmg 
  77. + 3    click1.au        # lrifle 
  78. + 4    click1.au        # rifle 
  79. + 5    click1.au        # hrifle 
  80. + 6    click1.au        # lcannon 
  81. + 7    click1.au        # cannon 
  82. + 8    click1.au        # hcannon 
  83. + 9    click1.au        # lrocket 
  84. + 10     click1.au        # rocket 
  85. + 11    click1.au        # hrocket 
  86. + 12    click1.au        # acid 
  87. + 13    click1.au        # flame 
  88. + 14    drip.au            # mine 
  89. + 15    Missle1.au        # seeker 
  90. + 16    click1.au        # slick 
  91. + 17    click1.au        # procket 
  92. + 18    click1.au        # umissle 
  93. + 19    click1.au        # harm 
  94. + 20    click1.au        # disc 
  95. + 21    boom.au            # lightcyle explosion
  96. + 22    boom.au            # hexo explosion
  97. + 23    boom.au            # spider explosion
  98. + 24    boom.au            # psycho explosion
  99. + 25    boom.au            # tornado explosion
  100. + 26    boom.au            # marauder explosion
  101. + 27    boom.au            # tiger explosion
  102. + 28    boom.au            # rhino explosion
  103. + 29    boom.au            # medusa explosion
  104. + 30    boom.au            # malice explosion
  105. + 31    boom.au            # trike explosion
  106. + 32    boom.au            # panzy explosion
  107. + 33    bong.au            # vehicle hit wall
  108. + 34    better_boing.au        # vehicle hit vehicle
  109. + 35    arrp.au            # bullet hit vehicle
  110. + 36    tap2.au            # bullet hit wall
  111. + 37    sub_dive_horn.au    # attention
  112. + 38    game_over.au        # goodbye
  113. + 39    Sonar.au        # sonar
  114. *** /dev/null    Tue Jun 23 13:51:37 1992
  115. --- Src/Include/sound.h    Mon Jun 22 16:28:47 1992
  116. ***************
  117. *** 0 ****
  118. --- 1,67 ----
  119. + #ifndef    _sound_h
  120. + #define    _sound_h
  121. + 
  122. + /*
  123. +  * This file contains the sound indexes into the sound table
  124. +  * The indexes here must be consistent with those in the file Sounds/list
  125. +  */
  126. + 
  127. + /*
  128. +  * maximum number of sounds
  129. +  */
  130. + #define MAX_SOUNDS            128
  131. + 
  132. + /*
  133. +  * sounds for all the types of weapons
  134. +  */
  135. + #define LMG_SOUND            0
  136. + #define MG_SOUND            1
  137. + #define HMG_SOUND            2
  138. + #define LRIFLE_SOUND            3
  139. + #define RIFLE_SOUND            4
  140. + #define HRIFLE_SOUND            5
  141. + #define LCANNON_SOUND            6
  142. + #define CANNON_SOUND            7
  143. + #define HCANNON_SOUND            8
  144. + #define LROCKET_SOUND            9
  145. + #define ROCKET_SOUND            10
  146. + #define HROCKET_SOUND            11
  147. + #define ACID_SOUND            12
  148. + #define FLAME_SOUND            13
  149. + #define MINE_SOUND            14
  150. + #define SEEKER_SOUND            15
  151. + #define SLICK_SOUND            16
  152. + #define PROCKET_SOUND            17
  153. + #define UMISSLE_SOUND            18
  154. + #define HARM_SOUND            19
  155. + #define DISC_SOUND            20
  156. + /*
  157. +  * explosion sounds for all tank bodies types
  158. +  */
  159. + #define LIGHTCYCLE_EXPLOSION_SOUND    21
  160. + #define HEXO_EXPLOSION_SOUND        22
  161. + #define SPIDER_EXPLOSION_SOUND        23
  162. + #define PSYCHO_EXPLOSION_SOUND        24
  163. + #define TORNADO_EXPLOSION_SOUND        25
  164. + #define MARAUDER_EXPLOSION_SOUND    26
  165. + #define TIGER_EXPLOSION_SOUND        27
  166. + #define RHINO_EXPLOSION_SOUND        28
  167. + #define MEDUSA_EXPLOSION_SOUND        29
  168. + #define MALICE_EXPLOSION_SOUND        30
  169. + #define TRIKE_EXPLOSION_SOUND        31
  170. + #define PANZY_EXPLOSION_SOUND        32
  171. + /*
  172. +  * hit sounds
  173. +  */
  174. + #define VEHICLE_HIT_WALL_SOUND        33
  175. + #define VEHICLE_HIT_VEHICLE_SOUND    34
  176. + #define BULLET_HIT_VEHICLE_SOUND    35
  177. + #define BULLET_HIT_WALL_SOUND        36
  178. + /*
  179. +  * misc sounds
  180. +  */
  181. + #define ATTENTION_SOUND            37
  182. + #define GOODBYE_SOUND            38
  183. + #define SONAR_SOUND            39
  184. + 
  185. + #endif    _sound_h
  186. *** /dev/null    Tue Jun 23 13:51:37 1992
  187. --- Src/sound.c    Thu Jun 18 14:12:45 1992
  188. ***************
  189. *** 0 ****
  190. --- 1,140 ----
  191. + #include "limits.h"
  192. + #include "xtank.h"
  193. + #include "graphics.h"
  194. + #include "gr.h"
  195. + #include "xtanklib.h"
  196. + #include "vehicle.h"
  197. + #include "globals.h"
  198. + #include "terminal.h"
  199. + #include "assert.h"
  200. + #include <sys/types.h>
  201. + #include <sys/param.h>
  202. + #include <sys/socket.h>
  203. + #include <netinet/in.h>
  204. + #include <netdb.h>
  205. + #include <stdio.h>
  206. + #ifdef SOUND
  207. + #include "sound.h"
  208. + 
  209. + extern Terminal    *terminal[];
  210. + extern int    num_terminals;
  211. + 
  212. + /*
  213. +  * the sound table
  214. +  */
  215. + int    sound_table[MAX_TERMINALS][MAX_SOUNDS];
  216. + 
  217. + /*
  218. +  * initialize sound for the given terminal
  219. +  */
  220. + init_terminal_sound(t)
  221. + Terminal    *t;
  222. + {
  223. +     int        index, id, bind_fd;
  224. +     char        *p, *rindex();
  225. +     char        host[MAXHOSTNAMELEN], buf[MAXPATHLEN], name[MAXPATHLEN];
  226. +     Video        *vidptr;
  227. +     extern char    pathname[], soundsdir[];
  228. +     char        filename[MAXPATHLEN];
  229. +     FILE        *fp;
  230. + 
  231. +     draw_text_rc(ANIM_WIN, 0, 1, "Initializing Sounds...", M_FONT, WHITE);
  232. +     sync_output(TRUE);
  233. + 
  234. +     /*
  235. +      * get the display hostname 
  236. +      */
  237. +     vidptr = (Video *)t->video;
  238. +     sprintf(host, "%s", vidptr->display_name);
  239. +     p = rindex(host, ':');
  240. +     *p = '\0';
  241. +     if (*host == '\0')
  242. +         strcat(host, "localhost");
  243. + 
  244. +     /*
  245. +      * initialize rplayd connection
  246. +      */
  247. +     t->rplay_fd = rplay_init(host);
  248. +     if (t->rplay_fd < 0) {
  249. +         rplay_perror(host);
  250. +         return -1;
  251. +     }
  252. + 
  253. +     /*
  254. +      * initialize rplaybindd connection
  255. +      */
  256. +     bind_fd = rplaybind_init(host);
  257. +     if (bind_fd < 0) {
  258. +         rplay_perror(host);
  259. +         close(t->rplay_fd);
  260. +         t->rplay_fd = -1;
  261. +         return -1;
  262. +     }
  263. + 
  264. +     strcpy(filename, pathname);
  265. +     strcat(filename, "/");
  266. +     strcat(filename, soundsdir);
  267. +     strcat(filename, "/");
  268. +     strcat(filename, "list");
  269. + 
  270. +     fp = fopen(filename, "r");
  271. +     if (fp == NULL) {
  272. +         fprintf(stderr, "Could not open file %s.\n", filename);
  273. +         exit(1);
  274. +     }
  275. + 
  276. +     /*
  277. +      * bind all the sounds in the sounds list to the host
  278. +      * store the returned sound ids in the sound table
  279. +      */
  280. +     while(fgets(buf, sizeof(buf), fp) != NULL) {
  281. +         if (buf[0] == '#' || buf[0] == '\n') continue;
  282. +         sscanf(buf, "%d %s", &index, name);
  283. +         id = rplaybind(bind_fd, name);
  284. +         if (id < 0) {
  285. +             rplay_perror(host);
  286. +             t->rplay_fd = -1;
  287. +             return -1;
  288. +         }
  289. +         if (id == 0) {
  290. +             fprintf(stderr, "%s not found at %s\n", name, host);
  291. +             id = -1;
  292. +         }
  293. +         sound_table[t->num][index] = id;
  294. +     } 
  295. + 
  296. +     /*
  297. +      * close the rplaybindd connection
  298. +      */
  299. +     close(bind_fd);
  300. + 
  301. +     play_terminal(t, SONAR_SOUND);
  302. + 
  303. +     return 0;
  304. + }
  305. + 
  306. + /*
  307. +  * play a sound on a terminal
  308. +  */
  309. + play_terminal(t, index)
  310. + Terminal    *t;
  311. + int        index;
  312. + {
  313. +     if (t->rplay_fd > 0 && sound_table[t->num][index] > 0)
  314. +         rplay(t->rplay_fd, sound_table[t->num][index]);
  315. + }
  316. + 
  317. + /*
  318. +  * play a sound on all terminals
  319. +  */
  320. + play_all(index)
  321. + int    index;
  322. + {
  323. +     int    x;
  324. +     
  325. +     for(x = 0; x < num_terminals; x++)
  326. +         if (terminal[x]->rplay_fd > 0 && sound_table[terminal[x]->num][index] > 0)
  327. +             rplay(terminal[x]->rplay_fd, sound_table[terminal[x]->num][index]);
  328. + }
  329. + 
  330. + #endif SOUND
  331. Common subdirectories: ./Bin and ../xtank1.3d-sound/Bin
  332. Common subdirectories: ./Doc and ../xtank1.3d-sound/Doc
  333. Common subdirectories: ./Help and ../xtank1.3d-sound/Help
  334. diff -c -r ./Imakefile.Config ../xtank1.3d-sound/Imakefile.Config
  335. *** ./Imakefile.Config    Sun Feb  9 21:28:45 1992
  336. --- ../xtank1.3d-sound/Imakefile.Config    Tue Jun 23 09:30:30 1992
  337. ***************
  338. *** 152,162 ****
  339.   /**/# recreate the bug!)
  340.   /**/# Most sites should leave it undefined.
  341.   /**/#
  342.   /**/# Everybody needs to know the following global things about xtank
  343.   
  344.   DEFINES2        = -DX11 -DUNIX -DS1024x864 -DKEYPAD_DETECT \
  345.           -DSTINGY_REDRAW -DBATCH_LINES -DBATCH_POINTS \
  346. !         -DCODE_SIZE=0x20000 -DSTACK_SIZE=0x8000 $(ARCH_DEFINES)
  347.   
  348.   DEFINES         = -DXTANK_DIR=\"/src/pub/xtank\" $(DEFINES2) \
  349.           -DALLDEFINES="\"$(DEFINES2)\""
  350. --- 152,167 ----
  351.   /**/# recreate the bug!)
  352.   /**/# Most sites should leave it undefined.
  353.   /**/#
  354. + /**/# -DSOUND
  355. + /**/# Enable only if you are using a Sun with sound support.
  356. + /**/# You must also have the rplay sound package for sound to work.
  357. + /**/#
  358.   /**/# Everybody needs to know the following global things about xtank
  359.   
  360.   DEFINES2        = -DX11 -DUNIX -DS1024x864 -DKEYPAD_DETECT \
  361.           -DSTINGY_REDRAW -DBATCH_LINES -DBATCH_POINTS \
  362. !         -DCODE_SIZE=0x20000 -DSTACK_SIZE=0x8000 $(ARCH_DEFINES) \
  363. !         -DSOUND
  364.   
  365.   DEFINES         = -DXTANK_DIR=\"/src/pub/xtank\" $(DEFINES2) \
  366.           -DALLDEFINES="\"$(DEFINES2)\""
  367. Common subdirectories: ./Mazes and ../xtank1.3d-sound/Mazes
  368. Common subdirectories: ./Programs and ../xtank1.3d-sound/Programs
  369. Only in ../xtank1.3d-sound: Sounds
  370. Common subdirectories: ./Src and ../xtank1.3d-sound/Src
  371. Common subdirectories: ./Todo and ../xtank1.3d-sound/Todo
  372. Common subdirectories: ./Util and ../xtank1.3d-sound/Util
  373. Common subdirectories: ./Vehicles and ../xtank1.3d-sound/Vehicles
  374. diff -c -r ./Bin/xtank ../xtank1.3d-sound/Bin/xtank
  375. *** ./Bin/xtank    Sat Feb  1 14:00:59 1992
  376. --- ../xtank1.3d-sound/Bin/xtank    Tue Jun 23 09:55:05 1992
  377. ***************
  378. *** 3,8 ****
  379. --- 3,9 ----
  380.   XTANK_VEHICLES=Vehicles
  381.   XTANK_MAZES=Mazes
  382.   XTANK_PROGRAMS=Programs
  383. + XTANK_SOUNDS=Sounds
  384.   
  385.   #
  386.   # rpotter thinks this is a kludge, I think it is funny! (lidl)
  387. Common subdirectories: ./Doc/Src and ../xtank1.3d-sound/Doc/Src
  388. Common subdirectories: ./Programs/Old and ../xtank1.3d-sound/Programs/Old
  389. Common subdirectories: ./Programs/Old/Old and ../xtank1.3d-sound/Programs/Old/Old
  390. Common subdirectories: ./Src/Fixed-Point and ../xtank1.3d-sound/Src/Fixed-Point
  391. diff -c -r ./Src/Imakefile ../xtank1.3d-sound/Src/Imakefile
  392. *** ./Src/Imakefile    Sun Feb  9 21:46:14 1992
  393. --- ../xtank1.3d-sound/Src/Imakefile    Tue Jun 16 10:10:17 1992
  394. ***************
  395. *** 17,23 ****
  396.                       objects.c program.c radar.c repair.c scroll.c setup.c \
  397.                       setups.c status.c sysdep.c thread.c unix.c update.c \
  398.                       util.c vdesign.c vehicle.c newfile.c vload.c \
  399. !                     version.c $(SRCS2)
  400.                OBJS = 3d.o XMultiSync.o actions.o animate.o box.o collision.o \
  401.                       console.o cosell.o display.o escher.o explosion.o \
  402.                       file.o game.o gr.o graphics.o highlib.o hit.o icounter.o \
  403. --- 17,23 ----
  404.                       objects.c program.c radar.c repair.c scroll.c setup.c \
  405.                       setups.c status.c sysdep.c thread.c unix.c update.c \
  406.                       util.c vdesign.c vehicle.c newfile.c vload.c \
  407. !                     sound.c version.c $(SRCS2)
  408.                OBJS = 3d.o XMultiSync.o actions.o animate.o box.o collision.o \
  409.                       console.o cosell.o display.o escher.o explosion.o \
  410.                       file.o game.o gr.o graphics.o highlib.o hit.o icounter.o \
  411. ***************
  412. *** 26,32 ****
  413.                       objects.o program.o radar.o repair.o scroll.o setup.o \
  414.                       setups.o status.o sysdep.o thread.o unix.o update.o \
  415.                       util.o vdesign.o vehicle.o newfile.o vload.o \
  416. !                     version.o $(OBJS2)
  417.                INCL = Include/bullet.h Include/common.h Include/cosell.h \
  418.                       Include/disc.h Include/game.h Include/globals.h \
  419.                       Include/gr.h Include/graphics.h Include/icounter.h \
  420. --- 26,32 ----
  421.                       objects.o program.o radar.o repair.o scroll.o setup.o \
  422.                       setups.o status.o sysdep.o thread.o unix.o update.o \
  423.                       util.o vdesign.o vehicle.o newfile.o vload.o \
  424. !                     sound.o version.o $(OBJS2)
  425.                INCL = Include/bullet.h Include/common.h Include/cosell.h \
  426.                       Include/disc.h Include/game.h Include/globals.h \
  427.                       Include/gr.h Include/graphics.h Include/icounter.h \
  428. ***************
  429. *** 40,46 ****
  430.                       Include/terminal.h Include/thread.h Include/tread-defs.h \
  431.                       Include/types.h Include/vdesc.h Include/vehicle.h \
  432.                       Include/vehicleparts.h Include/vstructs.h \
  433. !                     Include/weapon-defs.h Include/xtank.h Include/xtanklib.h
  434.               XINCL = Include/Xlibos.h Include/x11.h
  435.   
  436.   /**/# Note that both x11.c and mazeconv.c are included in other .c files,
  437. --- 40,47 ----
  438.                       Include/terminal.h Include/thread.h Include/tread-defs.h \
  439.                       Include/types.h Include/vdesc.h Include/vehicle.h \
  440.                       Include/vehicleparts.h Include/vstructs.h \
  441. !                     Include/weapon-defs.h Include/xtank.h Include/xtanklib.h \
  442. !                     Include/sound.h
  443.               XINCL = Include/Xlibos.h Include/x11.h
  444.   
  445.   /**/# Note that both x11.c and mazeconv.c are included in other .c files,
  446. ***************
  447. *** 52,58 ****
  448.   
  449.   /**/# Everybody needs the following libraries
  450.   
  451. !   EXTRA_LIBRARIES = -LPrograms -lxtankrobots -lm
  452.   
  453.   /**/# Start of System Dependent Things
  454.   /**/# (e.g. libraries, linker flags and so forth)
  455. --- 53,59 ----
  456.   
  457.   /**/# Everybody needs the following libraries
  458.   
  459. !   EXTRA_LIBRARIES = -LPrograms -lxtankrobots -lm -L/usr/local/lib -lrplay
  460.   
  461.   /**/# Start of System Dependent Things
  462.   /**/# (e.g. libraries, linker flags and so forth)
  463. ***************
  464. *** 89,95 ****
  465.   #endif
  466.   #ifdef SunArchitecture
  467.       SYS_LIBRARIES = /usr/lib/debug/malloc.o -llwp
  468. !         CCOPTIONS = -Bstatic
  469.   #ifdef SparcArchitecture
  470.   /**/# Sun4
  471.   #else
  472. --- 90,96 ----
  473.   #endif
  474.   #ifdef SunArchitecture
  475.       SYS_LIBRARIES = /usr/lib/debug/malloc.o -llwp
  476. !         CCOPTIONS = /**/#-Bstatic
  477.   #ifdef SparcArchitecture
  478.   /**/# Sun4
  479.   #else
  480. Common subdirectories: ./Src/Include and ../xtank1.3d-sound/Src/Include
  481. Common subdirectories: ./Src/Objects and ../xtank1.3d-sound/Src/Objects
  482. Common subdirectories: ./Src/Old and ../xtank1.3d-sound/Src/Old
  483. Common subdirectories: ./Src/Programs and ../xtank1.3d-sound/Src/Programs
  484. diff -c -r ./Src/file.c ../xtank1.3d-sound/Src/file.c
  485. *** ./Src/file.c    Sun Feb  9 21:45:41 1992
  486. --- ../xtank1.3d-sound/Src/file.c    Wed Jun 17 13:48:56 1992
  487. ***************
  488. *** 120,125 ****
  489. --- 120,128 ----
  490.   char pathname[MAXPATHLEN];
  491.   char headersdir[MAXPATHLEN];    /* full name of directory to find headers in */
  492.   char vehiclesdir[MAXNAMLEN], mazesdir[MAXNAMLEN], programsdir[MAXNAMLEN];
  493. + #ifdef SOUND
  494. + char soundsdir[MAXPATHLEN];
  495. + #endif SOUND
  496.   char username[MAX_STRING], displayname[256];
  497.   
  498.   #ifdef NEED_AUX_FONT
  499. ***************
  500. *** 168,174 ****
  501.       (void) strcpy(filename, "XVDIR:list");
  502.   #endif /* AMIGA */
  503.   
  504. !     draw_text_rc(ANIM_WIN, 0, 1, "Reading vehicle list...", M_FONT, WHITE);
  505.       sync_output(TRUE);
  506.       if ((file = fopen(filename, "r")) != NULL)
  507.       {
  508. --- 171,177 ----
  509.       (void) strcpy(filename, "XVDIR:list");
  510.   #endif /* AMIGA */
  511.   
  512. !     draw_text_rc(ANIM_WIN, 0, 2, "Reading vehicle list...", M_FONT, WHITE);
  513.       sync_output(TRUE);
  514.       if ((file = fopen(filename, "r")) != NULL)
  515.       {
  516. ***************
  517. *** 196,202 ****
  518.       (void) strcpy(filename, "XMDIR:list");
  519.   #endif /* AMIGA */
  520.   
  521. !     draw_text_rc(ANIM_WIN, 0, 2, "Reading maze list...", M_FONT, WHITE);
  522.       sync_output(TRUE);
  523.       if ((file = fopen(filename, "r")) != NULL)
  524.       {
  525. --- 199,205 ----
  526.       (void) strcpy(filename, "XMDIR:list");
  527.   #endif /* AMIGA */
  528.   
  529. !     draw_text_rc(ANIM_WIN, 0, 3, "Reading maze list...", M_FONT, WHITE);
  530.       sync_output(TRUE);
  531.       if ((file = fopen(filename, "r")) != NULL)
  532.       {
  533. ***************
  534. *** 729,734 ****
  535. --- 732,740 ----
  536.       strcpy(vehiclesdir, (p = getenv("XTANK_VEHICLES")) ? p : "Vehicles");
  537.       strcpy(mazesdir, (p = getenv("XTANK_MAZES")) ? p : "Mazes");
  538.       strcpy(programsdir, (p = getenv("XTANK_PROGRAMS")) ? p : "Programs");
  539. + #ifdef SOUND
  540. +     strcpy(soundsdir, (p = getenv("XTANK_SOUNDS")) ? p : "Sounds");
  541. + #endif SOUND
  542.       if ((p = getenv("XTANK_HEADERS")) != NULL) {
  543.           strcpy(headersdir, p);
  544.       } else {
  545. diff -c -r ./Src/gr.c ../xtank1.3d-sound/Src/gr.c
  546. *** ./Src/gr.c    Sun Feb  9 21:45:43 1992
  547. --- ../xtank1.3d-sound/Src/gr.c    Tue Jun 16 11:08:52 1992
  548. ***************
  549. *** 134,139 ****
  550. --- 134,143 ----
  551.       /* Initialize 3D values for terminal */
  552.       init_terminal_3d(t);
  553.   
  554. + #ifdef SOUND
  555. +     init_terminal_sound(t);
  556. + #endif SOUND
  557. + 
  558.       return 0;
  559.   }
  560.   
  561. ***************
  562. *** 174,179 ****
  563. --- 178,188 ----
  564.   close_terminal(t)
  565.   Terminal *t;
  566.   {
  567. + #ifdef SOUND
  568. +     if (t->rplay_fd > 0) {
  569. +         close(t->rplay_fd);
  570. +     }
  571. + #endif SOUND
  572.       close_video((Video *) t->video);
  573.       free((char *) t);
  574.   }
  575. diff -c -r ./Src/hit.c ../xtank1.3d-sound/Src/hit.c
  576. *** ./Src/hit.c    Sun Feb  9 21:45:45 1992
  577. --- ../xtank1.3d-sound/Src/hit.c    Tue Jun 16 10:02:49 1992
  578. ***************
  579. *** 52,59 ****
  580.   #include "terminal.h"
  581.   #include "cosell.h"
  582.   #include "globals.h"
  583.   
  584. - 
  585.   extern Map real_map;
  586.   extern Settings settings;
  587.   
  588. --- 52,61 ----
  589.   #include "terminal.h"
  590.   #include "cosell.h"
  591.   #include "globals.h"
  592. + #ifdef SOUND
  593. + #include "sound.h"
  594. + #endif SOUND
  595.   
  596.   extern Map real_map;
  597.   extern Settings settings;
  598.   
  599. ***************
  600. *** 98,103 ****
  601. --- 100,109 ----
  602.       Side side;
  603.       int has_ramplate1, has_ramplate2;
  604.   
  605. + #ifdef SOUND
  606. +     play_all(VEHICLE_HIT_VEHICLE_SOUND);
  607. + #endif SOUND
  608. + 
  609.   #ifdef GDEBUG
  610.       int itemp1, itemp2;
  611.       static FILE *statfile = NULL;
  612. ***************
  613. *** 196,201 ****
  614. --- 202,211 ----
  615.       int dx, dy, damage, damage1, damage2;
  616.       int has_ramplate = FALSE;
  617.   
  618. + #ifdef SOUND
  619. +     play_all(VEHICLE_HIT_WALL_SOUND); 
  620. + #endif SOUND
  621. + 
  622.   #ifdef GDEBUG
  623.       int itemp1, itemp2;
  624.       static FILE *statfile = NULL;
  625. ***************
  626. *** 335,340 ****
  627. --- 345,354 ----
  628.       FLOAT angle;
  629.       int damage, height;
  630.   
  631. + #ifdef SOUND
  632. +     play_all(BULLET_HIT_VEHICLE_SOUND);
  633. + #endif SOUND
  634. + 
  635.       switch (b->type)
  636.       {
  637.         case DISC:
  638. ***************
  639. *** 469,474 ****
  640. --- 483,492 ----
  641.   {
  642.       FLOAT dx, dy;
  643.       int dam;
  644. + 
  645. + #ifdef SOUND
  646. +     play_all(BULLET_HIT_WALL_SOUND);
  647. + #endif SOUND
  648.   
  649.       /* Compute x and y distances from current location to point of contact */
  650.       switch (dir)
  651. diff -c -r ./Src/lowlib.c ../xtank1.3d-sound/Src/lowlib.c
  652. *** ./Src/lowlib.c    Sun Feb  9 21:45:52 1992
  653. --- ../xtank1.3d-sound/Src/lowlib.c    Tue Jun 16 10:02:49 1992
  654. ***************
  655. *** 73,78 ****
  656. --- 73,81 ----
  657.   #include "cosell.h"
  658.   #include "outpost.h"
  659.   #include "globals.h"
  660. + #ifdef SOUND
  661. + #include "sound.h"
  662. + #endif SOUND
  663.   
  664.   extern Weapon_stat weapon_stat[];
  665.   extern Armor_stat armor_stat[];
  666. ***************
  667. *** 684,689 ****
  668. --- 687,761 ----
  669.   #endif /* !NO_NEW_RADAR */
  670.           make_bullet(cv, &bloc, w->type, angle + PI / 100 * (50 - rnd(101)) / 50);
  671.       }
  672. + 
  673. + #ifdef SOUND
  674. +     switch(w->type) {
  675. +     case LMG:
  676. +         play_all(LMG_SOUND);
  677. +         break;
  678. +     case MG:
  679. +         play_all(MG_SOUND);
  680. +         break;
  681. +     case HMG:
  682. +         play_all(HMG_SOUND);
  683. +         break;
  684. +     case LRIFLE:
  685. +         play_all(LRIFLE_SOUND);
  686. +         break;
  687. +     case RIFLE:
  688. +         play_all(RIFLE_SOUND);
  689. +         break;
  690. +     case HRIFLE:
  691. +         play_all(HRIFLE_SOUND);
  692. +         break;
  693. +     case LCANNON:
  694. +         play_all(LCANNON_SOUND);
  695. +         break;
  696. +     case CANNON:
  697. +         play_all(CANNON_SOUND);
  698. +         break;
  699. +     case HCANNON:
  700. +         play_all(HCANNON_SOUND);
  701. +         break;
  702. +     case LROCKET:
  703. +         play_all(LROCKET_SOUND);
  704. +         break;
  705. +     case ROCKET:
  706. +         play_all(ROCKET_SOUND);
  707. +         break;
  708. +     case HROCKET:
  709. +         play_all(HROCKET_SOUND);
  710. +         break;
  711. +     case ACID:
  712. +         play_all(ACID_SOUND);
  713. +         break;
  714. +     case FLAME:
  715. +         play_all(FLAME_SOUND);
  716. +         break;
  717. +     case MINE:
  718. +         play_all(MINE_SOUND);
  719. +         break;
  720. +     case SEEKER:
  721. +         play_all(SEEKER_SOUND);
  722. +         break;
  723. +     case SLICK:
  724. +         play_all(SLICK_SOUND);
  725. +         break;
  726. +     case PROCKET:
  727. +         play_all(PROCKET_SOUND);
  728. +         break;
  729. +     case UMISSLE:
  730. +         play_all(UMISSLE_SOUND);
  731. +         break;
  732. +     case HARM:
  733. +         play_all(HARM_SOUND);
  734. +         break;
  735. +     case DISC:
  736. +         play_all(DISC_SOUND);
  737. +         break;
  738. +     }
  739. + #endif SOUND
  740. + 
  741.       }
  742.   
  743.       check_time();
  744. diff -c -r ./Src/main.c ../xtank1.3d-sound/Src/main.c
  745. *** ./Src/main.c    Sun Feb  9 21:45:53 1992
  746. --- ../xtank1.3d-sound/Src/main.c    Tue Jun 16 09:48:54 1992
  747. ***************
  748. *** 252,257 ****
  749. --- 252,258 ----
  750.       debug("Opening graphics toolkit");
  751.       open_graphics();
  752.   
  753. + 
  754.       /* Parse command line for display names and make a terminal for each one */
  755.       debug("Making terminals");
  756.       if (argc - iNumOpts > 1)
  757. Only in ../xtank1.3d-sound/Src: sound.c
  758. diff -c -r ./Src/vehicle.c ../xtank1.3d-sound/Src/vehicle.c
  759. *** ./Src/vehicle.c    Sun Feb  9 21:46:11 1992
  760. --- ../xtank1.3d-sound/Src/vehicle.c    Wed Jun 17 13:52:24 1992
  761. ***************
  762. *** 19,24 ****
  763. --- 19,25 ----
  764.    *
  765.   */
  766.   #include "xtank.h"
  767. + #include "graphics.h"
  768.   #include "xtanklib.h"
  769.   #include "vehicle.h"
  770.   #include "globals.h"
  771. ***************
  772. *** 27,34 ****
  773.   #include "disc.h"
  774.   #include "vstructs.h"
  775.   #include "assert.h"
  776.   
  777. - 
  778.   extern int team_color_bright[];
  779.   extern char team_char[];
  780.   extern Map real_map;
  781. --- 28,37 ----
  782.   #include "disc.h"
  783.   #include "vstructs.h"
  784.   #include "assert.h"
  785. + #ifdef SOUND
  786. + #include "sound.h"
  787. + #endif SOUND
  788.   
  789.   extern int team_color_bright[];
  790.   extern char team_char[];
  791.   extern Map real_map;
  792. ***************
  793. *** 380,385 ****
  794. --- 383,446 ----
  795.       int dam;
  796.       int i;
  797.       WeaponType wt;
  798. + 
  799. + /*
  800. +        type     size weight wghtlim space  drag hndl trts cost 
  801. +     {"Lightcycle", 2,   200,   800,   600,  .10,  8,  0,  3000},
  802. +     {"Hexo",       3,  1500,  5000,  4000,  .25,  6,  1,  4000},
  803. +     {"Spider",     3,  2500,  8000,  3000,  .40,  7,  1,  5000},
  804. +     {"Psycho",     4,  5000, 18000,  8000,  .60,  4,  1,  5000},
  805. +     {"Tornado",    4,  7000, 22000, 12000,  .80,  4,  1,  7000},
  806. +     {"Marauder",   5,  9000, 28000, 18000, 1.00,  3,  2, 10000},
  807. +     {"Tiger",      6, 11000, 35000, 22000, 1.50,  5,  1, 12000},
  808. +     {"Rhino",      7, 12000, 40000, 30000, 2.00,  3,  2, 10000},
  809. +     {"Medusa",     7, 14000, 40000, 25000, 1.20,  4,  3, 15000},
  810. +     {"Malice",     5,  4000, 20000, 15000,  .40,  7,  1, 17000},
  811. +     {"Trike",      2,   400,  1600,  1200,  .15,  6,  0,  4000},
  812. +     {"Panzy",      8, 22000, 70000, 45000, 3.00,  3,  4, 25000}
  813. + 
  814. +     The numbers below are taken from indexes into the above table
  815. + */
  816. + #ifdef SOUND
  817. +     switch(body) {
  818. +     case 0:
  819. +         play_all(LIGHTCYCLE_EXPLOSION_SOUND);
  820. +         break;
  821. +     case 1:
  822. +         play_all(HEXO_EXPLOSION_SOUND);
  823. +         break;
  824. +     case 2:
  825. +         play_all(SPIDER_EXPLOSION_SOUND);
  826. +         break;
  827. +     case 3:
  828. +         play_all(PSYCHO_EXPLOSION_SOUND);
  829. +         break;
  830. +     case 4:
  831. +         play_all(TORNADO_EXPLOSION_SOUND);
  832. +         break;
  833. +     case 5:
  834. +         play_all(MARAUDER_EXPLOSION_SOUND);
  835. +         break;
  836. +     case 6:
  837. +         play_all(TIGER_EXPLOSION_SOUND);
  838. +         break;
  839. +     case 7:
  840. +         play_all(RHINO_EXPLOSION_SOUND);
  841. +         break;
  842. +     case 8:
  843. +         play_all(MEDUSA_EXPLOSION_SOUND);
  844. +         break;
  845. +     case 9:
  846. +         play_all(MALICE_EXPLOSION_SOUND);
  847. +         break;
  848. +     case 10:
  849. +         play_all(TRIKE_EXPLOSION_SOUND);
  850. +         break;
  851. +     case 11:
  852. +         play_all(PANZY_EXPLOSION_SOUND);
  853. +         break;
  854. +     }
  855. + #endif SOUND
  856.   
  857.       /* Make a tank explosion around the victim */
  858.       explode_location(victim->loc, 1, EXP_TANK);
  859. Only in ../xtank1.3d-sound/Src/Include: sound.h
  860. diff -c -r ./Src/Include/terminal.h ../xtank1.3d-sound/Src/Include/terminal.h
  861. *** ./Src/Include/terminal.h    Sat Jan 25 21:02:03 1992
  862. --- ../xtank1.3d-sound/Src/Include/terminal.h    Tue Jun 16 10:04:40 1992
  863. ***************
  864. *** 52,57 ****
  865. --- 52,60 ----
  866.       Line  line[MAX_LINES];    /* lines drawn on the screen */
  867.       Boolean observer;        /* True if this terminal is not controlling a
  868.                      vehicle */
  869. + #ifdef SOUND
  870. +     int   rplay_fd;
  871. + #endif SOUND
  872.   } Terminal;
  873.   
  874.